From 487a1620fad80252f3adb9ea93d40f997cbd2422 Mon Sep 17 00:00:00 2001 From: Martin Nordholts Date: Sat, 17 Jan 2009 14:03:37 +0000 Subject: [PATCH] Move up forward declaration of BablList. * babl/babl.h: Move up forward declaration of BablList. * babl/babl-list.h: Completely rely on that declaration. svn path=/trunk/; revision=372 --- ChangeLog | 6 ++++++ babl/babl-list.h | 9 ++------- babl/babl.h | 4 ++-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index b6d7470..7822438 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-01-17 Martin Nordholts + + * babl/babl.h: Move up forward declaration of BablList. + + * babl/babl-list.h: Completely rely on that declaration. + 2009-01-17 Martin Nordholts * babl/babl.h: Don't have BABL_ALPHA_THRESHOLD public yet. diff --git a/babl/babl-list.h b/babl/babl-list.h index 7b35dea..d38eb6d 100644 --- a/babl/babl-list.h +++ b/babl/babl-list.h @@ -20,20 +20,15 @@ #define _BABL_LIST_H #ifndef _BABL_H -/* babl.h contains forward declaration - * typedef struct _BablList BablList; - */ #error babl-list.h is only to be included after babl.h #endif - -typedef struct _BablList +struct _BablList { int count; int size; Babl **items; -} _BablList; - +}; BablList * babl_list_init (void); diff --git a/babl/babl.h b/babl/babl.h index a62ad79..d6fa219 100644 --- a/babl/babl.h +++ b/babl/babl.h @@ -33,6 +33,8 @@ #include "babl-macros.h" #include "babl-main.h" +typedef struct _BablList BablList; + /* magic number used at the start of all babl objects, used to do * differentiation in polymorphic functions. (as well as manual * type check assertions). @@ -68,8 +70,6 @@ typedef int BablClassType; typedef union _Babl Babl; -typedef struct _BablList BablList; - typedef int (*BablEachFunction) (Babl *entry, void *data); -- 2.30.2